pv-on-hvm: Adjust mkbuildtree to handle pv_ops header placement

Due to the movement of the arch include directories, we need to adjust
where mkbuildtree looks for headers when building the pv drivers.
Also add a check for the location of features.c

Signed-off-by: Charles Arnold <carnold@novell.com>

diff --git a/unmodified_drivers/linux-2.6/mkbuildtree b/unmodified_drivers/linux-2.6/mkbuildtree
index 3c1c799c857678436ce3ab651408362f90cf4a4f..3aca16d6b09f3a781f57127d252d5d2d26e32ada 100755 (executable)
--- a/unmodified_drivers/linux-2.6/mkbuildtree
+++ b/unmodified_drivers/linux-2.6/mkbuildtree
@@ -33,7 +33,11 @@ for d in $(find ${XL}/drivers/xen/ -mindepth 1 -maxdepth 1 -type d); do
 done
 
 ln -sf ${XL}/drivers/xen/core/gnttab.c platform-pci
-ln -sf ${XL}/drivers/xen/core/features.c platform-pci
+if [ -f ${XL}/drivers/xen/core/features.c ]; then
+    ln -sf ${XL}/drivers/xen/core/features.c platform-pci
+else
+    ln -sf ${XL}/drivers/xen/features.c platform-pci
+fi
 ln -sf ${XL}/drivers/xen/core/xen_proc.c xenbus
 ln -sf ${XL}/drivers/xen/core/reboot.c platform-pci
 
@@ -47,7 +51,14 @@ ln -nsf ${XEN}/include/public include/xen/interface
 # be native and not xenolinux).
 case "$uname" in
 i[34567]86|x86_64)
-    if [ -d ${XL}/include/asm-x86 ]; then
+    if [ -d ${XL}/arch/x86/include/mach-xen ]; then
+        ln -sf ${XL}/arch/x86/include/mach-xen/asm/hypervisor.h include/asm
+        ln -sf ${XL}/arch/x86/include/mach-xen/asm/hypercall*.h include/asm
+        ln -sf ${XL}/arch/x86/include/mach-xen/asm/synch_bitops*.h include/asm
+        ln -sf ${XL}/arch/x86/include/mach-xen/asm/maddr*.h include/asm
+        ln -sf ${XL}/arch/x86/include/mach-xen/asm/gnttab_dma.h include/asm
+        ln -sf ${XL}/arch/x86/lib/scrub.c balloon
+    elif [ -d ${XL}/include/asm-x86 ]; then
         ln -sf ${XL}/include/asm-x86/mach-xen/asm/hypervisor.h include/asm
         ln -sf ${XL}/include/asm-x86/mach-xen/asm/hypercall*.h include/asm
         ln -sf ${XL}/include/asm-x86/mach-xen/asm/synch_bitops*.h include/asm